From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 28 Sep 2003 09:17:29 +0000 (+0000)
Subject: (Info-find-index-name): Search both with and without the " <1>" etc.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~25406
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4b0598fcde32572cc47458ed70b70fac80a540bd;p=emacs.git

(Info-find-index-name): Search both with and without the " <1>" etc.
suffixes which makeinfo appends to duplicate index entries.
---

diff --git a/lisp/info.el b/lisp/info.el
index 5777bc4451e..800ee86cbed 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2112,8 +2112,11 @@ Give a blank topic name to go to the Index node itself."
 		 (search-forward
 		  (format "`%s'" (substring name 0 (match-beginning 1)))
 		  nil t))
-	    (search-forward name nil t))
-	(beginning-of-line)
+	    (search-forward name nil t)
+	    ;; Try again without the " <1>" makeinfo can append
+            (and (string-match "\\`\\(.*\\) <[0-9]+>\\'" name)
+                 (Info-find-index-name (match-string 1 name))))
+	(progn (beginning-of-line) t)  ;; non-nil for recursive call
       (goto-char (point-min)))))
 
 (defun Info-undefined ()